Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx
authorTom Rini <[email protected]>
Tue, 18 Sep 2012 21:56:31 +0000 (14:56 -0700)
committerTom Rini <[email protected]>
Tue, 18 Sep 2012 21:56:31 +0000 (14:56 -0700)

Trivial merge